ci: switch back to upstream CraftMaster

The fix we needed was merged this week 🎉
https://invent.kde.org/packaging/craftmaster/-/merge_requests/7

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>

diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml
index 6f4fd7520f2ea0353abda3488a3342eb952c66f0..f6c59d4910f06ba93096d0c5e57e7df390dfa7ff 100644 (file)
--- a/.github/workflows/macos-build-and-test.yml
+++ b/.github/workflows/macos-build-and-test.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Download Craft
         run: |
-          git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }}
+          git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }}
 
       - name: Add Nextcloud client blueprints
         run: |

diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml
index 6bfc44d7e7a1ac50375895087bb1771f3ca0487b..2aa869326675b64a40027534669cf4a462518bb3 100644 (file)
--- a/.github/workflows/windows-build-and-test.yml
+++ b/.github/workflows/windows-build-and-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Craft Master with Nextcloud Client Deps
         shell: pwsh
         run: |
-          & cmd /C "git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1"
+          & cmd /C "git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1"
           
           function craft() {
               python "${{ env.CRAFT_MASTER_LOCATION }}\CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c $args

diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift
index 8024ba878f536da55c934cb9c41a766db9ea4a4a..11338ff51cf8bc0fa78f452877e3e2f000280623 100644 (file)
--- a/admin/osx/mac-crafter/Sources/main.swift
+++ b/admin/osx/mac-crafter/Sources/main.swift
@@ -43,7 +43,7 @@ struct Build: ParsableCommand {
     @Option(name: [.long], help: "Brew installation script URL.")
     var brewInstallShUrl = "https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh"
 
-    @Option(name: [.long], help: "CraftMaster git url.")
+    @Option(name: [.long], help: "CraftMaster Git URL.")
     var craftMasterGitUrl = "https://invent.kde.org/packaging/craftmaster.git"
 
     @Option(name: [.long], help: "Nextcloud Desktop Client craft blueprint git url.")